Mark ab/11976889 as merged in aosp-main-future Bug: 347831320 Merged-In: Ic680b115fe72fce7fd512c6be647e5315c1f21ab Change-Id: If3a85f71ddd486790850d79faa32d11be11e6868